Auto merge of #1117 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 2 Jan 2015 21:41:12 +0000 (21:41 +0000)
committerbors <bors@rust-lang.org>
Fri, 2 Jan 2015 21:41:12 +0000 (21:41 +0000)
commit16be22a880fa624c531bc18ae24ae68bbee1d82a
tree4f4840054f860fdd0e30d37d6407c23bb6016f07
parent1a1868b7015e908713dfc99d512bc8058402ff94
parent315341368cfad96ee2ceab16095403e5579c3eaf
Auto merge of #1117 - alexcrichton:update, r=alexcrichton